use sax::Converter:: base64 code instead

Change-Id: I92fd4459bed7c38ff2063899b20d24d781ac45b

From b9f83fca37a3544b825de9d2f295090257d3477b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 02 Jun 2012 22:14:45 +0000
Subject: ThreeByteToFourByte and friends are no longer in use

Change-Id: I9a2aaebfc5cc6b8b6327d61270043611283a6975

Gbp-Pq: Name CVE-2012-2665-binfilter.diff

Is CVE-2012-2665 fixed in LO?

On Thu, 2012-06-07 at 18:23 +0200, Petr Mladek wrote:
> Hi Caolan,
>
> I am a bit confused by all the security problems. Is CVE-2012-2665 fixed
> in LO-3.5?

Not yet. I wanted to wait to propose any more backports until the
backlog was cleared to try and avoid confusion :-)

So, I'm now requesting the following three additional commits to be
cherry-picked to 3-5

78f614e5fff70d4874322255cca739f430865f0a key-size
acc613a3236c61c8272bde1eadca5d8bf25f98f1 tag-hierarchy
4a7164429b727bd8fd6f183950e85e6225869364 count-and-order

to address CVE-2012-2665

I'd like to consider those three + the already cherry-picked
4036ee4db7b43cac9f892c2b9a2c545f0f838747 as our canonical solution to
CVE-2012-2665 (78f614e5fff70d4874322255cca739f430865f0a is technically
not really relevant but I reckon its easiest to bundle it into any
backports while we're at it to keep things simple)

C.

From 4036ee4db7b43cac9f892c2b9a2c545f0f838747 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 30 May 2012 14:10:25 +0000
Subject: merge three base64 encoders/decoders together

Conflicts:

        filter/source/placeware/Base64Codec.cxx
        package/source/manifest/Base64Codec.cxx

Change-Id: Ic123c081fcf6ddcf5d61c5d5a3eab01db470014c
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
From 78f614e5fff70d4874322255cca739f430865f0a Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 28 May 2012 09:33:40 +0000
Subject: check key size

Change-Id: Ia909b0abb3ef84a9f0a14d42379f693ae9e70812

From acc613a3236c61c8272bde1eadca5d8bf25f98f1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 28 May 2012 09:35:31 +0000
Subject: unwind manifest xml parser and follow tag hierarchy model

so we validate that each tag is inside the right parent

Change-Id: Ibc82aeaf6b409ef2fed7de0cd8f15c164da65e53

From 4a7164429b727bd8fd6f183950e85e6225869364 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 28 May 2012 10:43:09 +0000
Subject: count and order of receipt of properties doesn't matter

so stick imported properties into assigned slots and throw out empty ones when
finished. Reuse existing ids for this between import and export. Shuffle
FULLPATH to 0 as per import comment

Change-Id: I516116c5327498ad043f6e2fb9bd257599ade2a2

Gbp-Pq: Name CVE-2012-2665.diff

clip max entries

Signed-off-by: Petr Mladek <pmladek@suse.cz>
Gbp-Pq: Name CVE-2012-2334-clip-max-entries.diff

evolution-3.4

Gbp-Pq: Name evolution-3.4.diff

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

Gbp-Pq: Name fix-legacy-report-opening.diff

fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

This partially reverts commit 2233aa52da14ec85331aee1163b885fe9a9fb507
and commit 8d9e2d9a211f710e91ac7c607fea25895282d245

Before the keyboard name was used to determine the target language
for translation of UI shortcuts. With this patch the UI locale
is used to determine the language.

Related to:
- 8d9e2d9a211f710e91ac7c607fea25895282d245
- 04b9c2f633f0be1b676933943bdd0b1dc58b5471

Change-Id: Id7ee05ed4065dd4f0c12d283413e97092e95a15f

Gbp-Pq: Name make-shortcuts-in-menus-localized-again.diff

remove -fsigned-char from s390 to fix smoketest..

Change-Id: I66c468e917513cdb096937f9955eb8a41aabaa37

Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Gbp-Pq: Name fix-signed-char-mess.diff

ppc: yyinput returns a int, truncating to (unsigned)char does't work

retain this as an int so that on platforms where char is unsigned
we don't mangle the value and get this all wrong.

Fixes database opening tables on ppc if -fsigned-char is removed

Change-Id: I66f0c6b1b19191595f8b348377579f2daabf7ada

Gbp-Pq: Name yyinput-fix-for-unsigned-char.diff

wrong types used here, breaks 64bit bigendian

Gbp-Pq: Name fix-Test-BigPtrArray-on-64bit-bigendian.diff

ignore-sc_cellrangesbase-fails

Gbp-Pq: Name ignore-sc_cellrangesbase-fails.diff

lp#904212: add missing mimetypes to impress.desktop

* application/vnd.openxmlformats-officedocument.presentationml.slide
* application/vnd.openxmlformats-officedocument.presentationml.slideshow

Conflicts:

sysui/desktop/menus/impress.desktop

Gbp-Pq: Name lp-904212-add-missing-mimetypes-to-impress.desktop.diff

gcc-4.4

Gbp-Pq: Name gcc-4.4.diff

lp-926940-visio-mime-for-draw

===================================================================

Gbp-Pq: Name lp-926940-visio-mime-for-draw.diff

codemaker: write version 49 (1.5) class files

The trick of writing generic types into class files of versions < 49
does no longer work with javac from OpenJDK 7:

/comphelper/qa/complex/comphelper/Map.java:154: error: type Pair does
not take parameters
  Pair< ?, ? >[] initialMappings = new Pair< ?, ? >[ _keys.length ];

There appears to be a related JDK bug for this, at some time javac had
an undocumented option to produce similar class files that are also
rejected now, this has been closed as "Not a Defect":

http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7078419

Change-Id: I8a504f6cbb3bb58cd914aebb88637cc6feb0bd48
(cherry picked from commit 26643fb59e0005f0bc83708b785d20d62d8e7411)

Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Gbp-Pq: Name jdk7.diff

gcc-4.7-amd64

m 0fdbb5b0eabbaa571f3747fda12a56c938cba474 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 29 Mar 2012 15:50:16 +0000
Subject: Make cpp_uno/gcc3_linux_x86-64 bridge work with GCC 4.7

See comment in callvirtualmethod.cxx for details.

From fa09866ccb5bc197ad3e1ec1a453d6fab20cd7df Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 30 Mar 2012 11:58:34 +0000
Subject: Adapt cpp_uno/gcc3_linux_x86-64 to GCC 4.7 cxxabi.h

...the same way cpp_uno/mingw_intel was already adapted.

Gbp-Pq: Name gcc-4.7-amd64.diff

Adapt cpp_uno/gcc3_linux_intel to GCC 4.7

...the same way cpp_uno/gcc3_linux_x86-64 was already adapted.

Gbp-Pq: Name gcc-4.7-i386.diff

GCC 4.7 -Werror=enum-compare

Gbp-Pq: Name gcc-4.7.diff

gtk3-hack-explicit-gmodule

For whatever reason we get undefined referenced to g_module_*.

Gbp-Pq: Name gtk3-hack-explicit-gmodule.diff

debian-hardened-buildflags

Gbp-Pq: Name debian-hardened-buildflags.diff

pythonloader.uno.so, libpyuno and pyuno are duplicates for linkoo too

Gbp-Pq: Name pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff

move binfilter mime types into extra .desktop file

Gbp-Pq: Name move-binfilter-mimetypes-in-extra-desktop-file.diff

mediwiki-oor-replace

Gbp-Pq: Name mediwiki-oor-replace.diff

disable-unoapi-subsequentcheck-for-now

Gbp-Pq: Name disable-unoapi-subsequentcheck-for-now.diff

propagate gb_FULLDEPS

Gbp-Pq: Name propagate-gb_FULLDEPS.diff

fix-ARM-detection-in-set-soenv

Gbp-Pq: Name fix-ARM-detection-in-set-soenv.diff

make-package-modules-not-suck

Gbp-Pq: Name make-package-modules-not-suck.diff

search-usr-share-for-images

Gbp-Pq: Name search-usr-share-for-images.diff

make-pyuno-work-with-system-wide-module-install

Gbp-Pq: Name make-pyuno-work-with-system-wide-module-install.diff

mysqlcppconn-libmysqlclient-SONAME

Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff

jdbc-driver-classpaths

Gbp-Pq: Name jdbc-driver-classpaths.diff

reportdesign-mention-package

Gbp-Pq: Name reportdesign-mention-package.diff

sensible-browser

===================================================================

Gbp-Pq: Name sensible-browser.diff

sensible-lomua

===================================================================

Gbp-Pq: Name sensible-lomua.diff

help-msg-add-package-info

===================================================================

Gbp-Pq: Name help-msg-add-package-info.diff

mention-java-common-package

===================================================================

Gbp-Pq: Name mention-java-common-package.diff

smoketest-only-en-US

Gbp-Pq: Name smoketest-only-en-US.diff

install-fixes

Gbp-Pq: Name install-fixes.diff

fix-system-lpsolve-build

Gbp-Pq: Name fix-system-lpsolve-build.diff

disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino as they SIGSEGV ld

 * at least on linking transex in l10ntools/source with ld from binutils-2.21.52.20110707-1ubuntu1

Gbp-Pq: Name disable-dynamic-list-cpp.diff

rhino-build-optional

Gbp-Pq: Name rhino-build-optional.diff

debian-debug

Gbp-Pq: Name debian-debug.diff

split-binfilters-and-evo

Gbp-Pq: Name split-binfilters-and-evo.diff

jurt-soffice-location

commit b71107fb12e3c3125e0cb62c5a4f6636a80c6408
Author:     Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
AuthorDate: Tue Jun 7 11:52:37 2011 +0200
Commit:     Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
CommitDate: Tue Jun 7 11:52:37 2011 +0200

    on debian-based systems, we know where our soffice binary is

Gbp-Pq: Name jurt-soffice-location.diff

gcj-safe-jni-h-include

Gbp-Pq: Name gcj-safe-jni-h-include.diff

debian-opt

Gbp-Pq: Name debian-opt.diff

no-minimaltoc

Gbp-Pq: Name no-minimaltoc.diff

libreoffice (1:3.5.4-7) unstable; urgency=high

  * debian/patches/CVE-2012-2665*.diff: fix CVE-2012-2665
    ("Multiple heap-based buffer overflows in the XML manifest
     encryption handling code")

  * debian/control.in: drop "| ttf-opensymbol" from -core and -math depends
    (closes: #682462)

[dgit import unpatched libreoffice 1:3.5.4-7]

Import libreoffice_3.5.4-7.debian.tar.gz

[dgit import tarball libreoffice 1:3.5.4-7 libreoffice_3.5.4-7.debian.tar.gz]

Import libreoffice_3.5.4.orig.tar.xz

[dgit import orig libreoffice_3.5.4.orig.tar.xz]

Import libreoffice_3.5.4.orig-binfilter.tar.xz

[dgit import orig libreoffice_3.5.4.orig-binfilter.tar.xz]

Import libreoffice_3.5.4.orig-dictionaries.tar.xz

[dgit import orig libreoffice_3.5.4.orig-dictionaries.tar.xz]

Import libreoffice_3.5.4.orig-helpcontent2.tar.xz

[dgit import orig libreoffice_3.5.4.orig-helpcontent2.tar.xz]

Import libreoffice_3.5.4.orig-src.tar.gz

[dgit import orig libreoffice_3.5.4.orig-src.tar.gz]

Import libreoffice_3.5.4.orig-translations.tar.xz

[dgit import orig libreoffice_3.5.4.orig-translations.tar.xz]